[TOOLS][POWERPC] fixes for the prose builder.

Signed-off-by: Maria Butrico <butrico@watson.ibm.com>
Signed-off-by: Jimi Xenidis <jimix@watson.ibm.com>
--HG--
extra : transplant_source : %C1e%86%00%05%25%F9%D9%DF%BB%E36%D9%D4X%DD%08%B4J%0E

diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c
index 6f3e643a6afc4ab210497db44a5842f803cbed86..371b83a94ebc099582e5964ca44d69ddd8296a49 100644 (file)
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -951,7 +951,7 @@ static PyObject *pyxc_prose_build(XcObject *self,
     int unused;
 
     static char *kwd_list[] = { "dom", "store_evtchn",
-                                "console_evtchn", "image",
+                                "console_evtchn", "image", "memsize",
                                 /* optional */
                                 "ramdisk", "cmdline", "flags",
                                 "features", "arch_args", NULL };

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 650c449415794090f85681a21c6f95aba2bbf852..8b94e40487d4ab6763146e9d1946cfb5cd41bd97 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -260,14 +260,10 @@ class PPC_LinuxImageHandler(LinuxImageHandler):
         return max(maxmem_kb / 64, shadow_mem_kb)
 
 
-class PPC_ProseImageHandler(LinuxImageHandler):
+class PPC_ProseImageHandler(PPC_LinuxImageHandler):
 
     ostype = "prose"
 
-    def configure(self, imageConfig, deviceConfig):
-        LinuxImageHandler.configure(self, imageConfig, deviceConfig)
-        self.imageConfig = imageConfig
-
     def buildDomain(self):
         store_evtchn = self.vm.getStorePort()
         console_evtchn = self.vm.getConsolePort()